Auto merge of #1477 - alexcrichton:issue-1474, r=huonw

author bors <bors@rust-lang.org>

Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)

committer bors <bors@rust-lang.org>

Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)
author bors <bors@rust-lang.org>
Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)
committer bors <bors@rust-lang.org>
Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)
diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge
diff --cc tests/test_cargo_test.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)
committer	bors <bors@rust-lang.org>
	Tue, 7 Apr 2015 07:45:42 +0000 (07:45 +0000)
		1	2
src/cargo/ops/cargo_rustc/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_test.rs	patch \|	diff1 \|	diff2 \|	blob \| history